Adwaita: correctly style headerbars in a stack

corners are correctly rounded now. Stacked splitted headerbars are
not supported yet though.

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index e5d21a409376cc089c07d17f2f9378476dd09b93..e3d02a0d35e41022603740b43e216bc9f22340bd 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -1569,11 +1569,18 @@ headerbar {
   }
 }
 
-headerbar {
+headerbar { // headerbar border rounding
   window:not(.tiled):not(.maximized):not(.solid-csd) separator:first-child + &, // tackles the paned container case
   window:not(.tiled):not(.maximized):not(.solid-csd) &:first-child { &:backdrop, & { border-top-left-radius: 7px; }}
-
   window:not(.tiled):not(.maximized):not(.solid-csd) &:last-child { &:backdrop, & { border-top-right-radius: 7px; }}
+  window:not(.tiled):not(.maximized):not(.solid-csd) stack & { // tackles the stacked headerbars case
+    &:first-child, &:last-child {
+      &:backdrop, & {
+        border-top-left-radius: 7px;
+        border-top-right-radius: 7px;
+      }
+    }
+  }
 }
 
 .titlebar:not(headerbar) {

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 04bbeb69411147218fb50ba5af11a409c7671882..400d6be9c7801f94898802644fec56d0bd400e55 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -2022,6 +2022,9 @@ window:not(.tiled):not(.maximized):not(.solid-csd) separator:first-child + heade
   border-top-left-radius: 7px; }
 window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:last-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:last-child {
   border-top-right-radius: 7px; }
+window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:first-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:first-child, window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:last-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:last-child {
+  border-top-left-radius: 7px;
+  border-top-right-radius: 7px; }
 
 window.csd > .titlebar:not(headerbar) {
   padding: 0;

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index d8058cebea1e7e0793c1ed2e89516e40687de728..879163ff05096b397f0317f73ef667671181d51a 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -2031,6 +2031,9 @@ window:not(.tiled):not(.maximized):not(.solid-csd) separator:first-child + heade
   border-top-left-radius: 7px; }
 window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:last-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) headerbar:last-child {
   border-top-right-radius: 7px; }
+window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:first-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:first-child, window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:last-child:backdrop, window:not(.tiled):not(.maximized):not(.solid-csd) stack headerbar:last-child {
+  border-top-left-radius: 7px;
+  border-top-right-radius: 7px; }
 
 window.csd > .titlebar:not(headerbar) {
   padding: 0;